Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 11 Apr 2007 13:45:43 +0000 (14:45 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 11 Apr 2007 13:45:43 +0000 (14:45 +0100)

Trivial merge